Skip to content

Replace cleanSelfLink with getResourceId #1304

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Jul 21, 2023
Merged

Replace cleanSelfLink with getResourceId #1304

merged 1 commit into from
Jul 21, 2023

Conversation

mattcary
Copy link
Contributor

/kind bug

Fixes #1302

Fix resource parsing when the gcp project name ends with alpha, beta or v1

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/bug Categorizes issue or PR as related to a bug. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Jul 21, 2023
@k8s-ci-robot k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jul 21, 2023
@mattcary mattcary mentioned this pull request Jul 21, 2023
Closed
@mattcary
Copy link
Contributor Author

/assign @judemars

@mattcary mattcary force-pushed the volid branch 2 times, most recently from af20482 to 32733c8 Compare July 21, 2023 18:42
@mattcary
Replace cleanSelfLink with getResourceId
4d07b05 
Change-Id: I81e79dd89d7bab65c7ccab3cd490b173593a888f
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: judemars, mattcary

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@judemars
Copy link
Contributor

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 21, 2023
@mattcary
Copy link
Contributor Author

/retest

Looking at history the job time has been ~18m, and this has also picked up the fsck change which may have increased the run time a bit. We may just need to increase the timeout on the test.

@k8s-ci-robot k8s-ci-robot merged commit 20bbe2b into kubernetes-sigs:master Jul 21, 2023
@mattcary
Copy link
Contributor Author

/cherry-pick release-1.10

@mattcary
Copy link
Contributor Author

/cherry-pick release-1.9

@mattcary mattcary deleted the volid branch July 21, 2023 22:08
@k8s-infra-cherrypick-robot
Copy link

@mattcary: new pull request created: #1307

In response to this:

/cherry-pick release-1.10

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-infra-cherrypick-robot k8s-infra-cherrypick-robot mentioned this pull request Jul 21, 2023
Merged
@k8s-infra-cherrypick-robot
Copy link

@mattcary: #1304 failed to apply on top of branch "release-1.9":

Applying: Replace cleanSelfLink with getResourceId
Using index info to reconstruct a base tree...
M	pkg/gce-cloud-provider/compute/fake-gce.go
M	pkg/gce-pd-csi-driver/controller.go
M	pkg/gce-pd-csi-driver/controller_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/gce-pd-csi-driver/controller_test.go
Auto-merging pkg/gce-pd-csi-driver/controller.go
CONFLICT (content): Merge conflict in pkg/gce-pd-csi-driver/controller.go
Auto-merging pkg/gce-cloud-provider/compute/fake-gce.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Replace cleanSelfLink with getResourceId
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-1.9

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

mattcary added a commit to mattcary/gcp-compute-persistent-disk-csi-driver that referenced this pull request Jul 21, 2023
@mattcary
Cherry-pick kubernetes-sigs#1304 to release-1.9
f2cfc81 
Change-Id: I02a481e7759a502a7ab7117d58357e8139d75971
@mattcary mattcary mentioned this pull request Jul 21, 2023
Merged
@mattcary
Copy link
Contributor Author

Manually created #1308 for release-1.9 cherry-pick.

1.8 is not affected.

k8s-ci-robot added a commit that referenced this pull request Jul 21, 2023
@k8s-ci-robot
Merge pull request #1308 from mattcary/getresource-1.9
74d094f 
Cherry-pick #1304 to release-1.9
@ialidzhikov ialidzhikov mentioned this pull request Aug 7, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sunnylovestiramisu sunnylovestiramisu sunnylovestiramisu left review comments

@judemars judemars judemars approved these changes

@leiyiz leiyiz Awaiting requested review from leiyiz

@saikat-royc saikat-royc Awaiting requested review from saikat-royc

Assignees

@judemars judemars

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

VolumeID is incorrect when project name contains beta
5 participants
@mattcary @k8s-ci-robot @judemars @k8s-infra-cherrypick-robot @sunnylovestiramisu